uncommented rds
uncommented rds commands
stuff
stuff
Merge branch 'dev' of https://github.com/UCDAAPIT/coursespace into dev

Conflicts:
	coursespace/settings.py
	coursespace/settings.pyc