Merge branch 'master' of heroku.com:polar-garden-3698

fixing merge conflict
updating readme
encapsulation 84b14521d5
Adding debugging around updating or creating users
mistake
ignore db again
Add chat_archiver to .gitignore