Adding DEV_SERVERS and DEV_USERS to manage.py
Merge branch 'master' of gh-personal:mpdavis/vinz