Adding username field to User model, and APIs
Merge pull request #52 from computmaxer/add_username_field

Add username field
Adding REST API and internal API methods for PublicKey resource
Adding grunt-shell to the provision script
Merge pull request #54 from mpdavis/grunt-stuff

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

Fixing the setup_dev script
Flask-Login is now working.
Merge branch 'master' of github.com:mpdavis/vinz
Merge branch 'master' into authentication_and_stuff

Conflicts:
	server/manage.py
Move and rename exceptions.py
Merge pull request #56 from computmaxer/authentication_and_stuff

Authentication with Flask-Login
Merge pull request #53 from computmaxer/public_key_api

Adding REST API and internal API methods for PublicKey resource