Merge branch 'master' of heroku.com:projectlorax

pulling down heroku master since i need to update secret keys. need to pull down before i can push up.
Merge branch 'master' of heroku.com:projectlorax