Explicitly require some vars, typos
Merge branch 'wip/heroku_deploy' into wip/personal