Merge remote-tracking branch 'origin/master' into SAN-3043-cache

* origin/master:
  fix password for khronos
  Password for Khronos mongodb user "api" was wrong.
  New MongoDB cluster. Will decom old in AM.
  spacing
  per rsandor - still need nginx router for runnable.com
  no more alpha
  Bye Felicia
  whoops two delta-navi's
  Bye bye Beta

Author: cflynn07

ansible/beta-hosts/docks.js

@@ -21,7 +21,7 @@ eru_github_id=46a23f5f99f0aa9460f8
 eru_github_secret=a0336d72e3d540fb9fbbed2c123a81e1cb329dab
 
 [khronos:vars]
-khronos_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
+khronos_mongo_auth=api:72192e5a-a5e1-11e5-add9-0270db32f7ad
 khronos_mongo_database=delta
 khronos_mongo_replset_name=delta
 

ansible/beta-hosts/hosts

@@ -6,9 +6,9 @@ gamma-hipache httpsCheckForBackend80=false prependIncomingPort=true subDomainDep
 gamma-userland-hipache domain=runnable.ninja httpsCheckForBackend80=true prependIncomingPort=true subDomainDepth=3
 
 [mongodb]
-gamma-mongo-us-west-2a
-gamma-mongo-us-west-2b
-gamma-mongo-us-west-2c
+gamma-mongo-a
+gamma-mongo-b
+gamma-mongo-c
 
 [neo4j]
 gamma-neo4j

ansible/beta-hosts/variables

@@ -21,7 +21,7 @@ eru_github_id=8abb08f83f6d1c52bd1a
 eru_github_secret=74a23ee56486d57b14f292283cb04625f600917c
 
 [khronos:vars]
-khronos_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
+khronos_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 khronos_mongo_database=gamma
 khronos_mongo_replset_name=gamma