Merge pull request #26 from JoshLankford/master

Add user information fields
fix heroku