Change Travis to behave with Rails 4.1's secrets.yml convention
Merge remote-tracking branch 'upstream/master'
Merge pull request #286 from pmq20/master

Change Travis to behave with Rails 4.1's secrets.yml convention