junk
Merge branch 'master' of http://github.com/bkavanagh/Swerver

Conflicts:
	conf/supervisord.conf
	conf/supervisord.log
Mirrored Local Server
added auth