Added servers
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype

Conflicts:
	app/templates/index.html
Defaulting to the key location for the vagrant box
Adding add_user
Removing a user
Adding commands to manage.py for adding and removing users
Adding a dev setup command to manage.py
Adding scan command back in
no message
Merge pull request #48 from computmaxer/master

limit watch to just views folder.
Merge pull request #49 from computmaxer/master

moving scripts back to "scripts" instead of "js" for yeoman support
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype
Merge pull request #50 from jacobhummel/frontend_prototype

Frontend prototype
Adding manager command
Merge pull request #46 from mpdavis/setup-script

Adding a dev setup command to manage.py
Merge pull request #45 from mpdavis/api

Adding user API method
Adding support for building the frontend automatically on the vagrant.
Merge pull request #51 from computmaxer/vagrant-frontend-support

Adding support for building the frontend automatically on the vagrant.
Merge branch 'master' of github.com:mpdavis/vinz