Pre-deploy fixes
Merge pull request #57 from f2prateek/deploy-fixes

Pre-deploy fixes