Added servers
Adding VinzRunner to remove a lot of the boilerplate we are going to have to write
Merge branch 'master' of https://github.com/mpdavis/vinz into frontend_prototype

Conflicts:
	app/templates/index.html
Moving VinzRunner to scanner instead of scanner/api because it is going to get used everywhere in scanner
Merge pull request #43 from mpdavis/scanner-api

VinzRunner
updating the run_dev.sh script to the moved folder
Merge branch 'master' of gh-personal:mpdavis/vinz
altering setup script for folder change
module_args instead of module_cmds
one more
Merge pull request #44 from organman91/master

module_cmds is actually module_args
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
Transitioned off of yeoman's grunt file
Adding scan command back in
Merge pull request #47 from computmaxer/no-more-yeoman-gruntfile

Transitioned off of yeoman's grunt file
no message