changes to work w/ heroku
Merge remote-tracking branch 'refs/remotes/origin/master' into heroky
comment out logger stuff in app file to avoid heroku error
Merge remote-tracking branch 'refs/remotes/origin/master'