Add settings endpoint for env_vars
Bump travis-core
Merge branch 'master' into ps-env-vars-in-settings

Conflicts:
	Gemfile.lock
Merge pull request #120 from travis-ci/ps-env-vars-in-settings

Add settings endpoint for env_vars
Run core's extra migrations without JRuby

Instead of cloning travis-logs and using JRuby to run migrations
try copying core's extra migrations to db/migrate
and run migrations straight up.
Merge pull request #124 from travis-ci/ha-bug-short_setup

Run core's extra migrations without JRuby
Rename encyrpt_all_data.rake to encrypt_all_data.rake

Fix typo in filename
Merge pull request #125 from brysgo/patch-1

Rename encyrpt_all_data.rake to encrypt_all_data.rake
Revert "Revert "Serve CORS from app""

This reverts commit 8694cb4b92c00d0edba6c48927daca97caad24e1.