Add files to .gitignore
Merge branch 'mb_heroku'