Fixing the setup_dev script
Merge pull request #55 from mpdavis/grunt-stuff

Fixing the setup_dev script
Merge branch 'master' of github.com:mpdavis/vinz
Merge branch 'master' into authentication_and_stuff

Conflicts:
	server/manage.py