Updating readme
Merge branch 'master' of github.com:mpdavis/vinz
Adding username field to User model, and APIs
Merge pull request #52 from computmaxer/add_username_field

Add username field
Adding grunt-shell to the provision script
Merge pull request #54 from mpdavis/grunt-stuff

Adding grunt-shell to the provision script
Fixing the setup_dev script
Merge pull request #55 from mpdavis/grunt-stuff

Fixing the setup_dev script
scanner merge conflict
Merge branch 'master' of gh-personal:mpdavis/vinz into scanner