Merge remote-tracking branch 'origin/master' into hourly-khronos-tabs-should-be-hourly

Author: Nathan219

ansible/group_vars/alpha-palantiri.yml

@@ -3,8 +3,8 @@ name: "palantiri"
 container_image: "registry.runnable.com/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
-node_version: "0.10.38"
-npm_version: "2.1.18"
+node_version: "4.2.2"
+npm_version: "2.14.7"
 
 # container settings
 container_envs: >