Update capistrano tasks to point at AWS servers.
Merge branch 'master' into production