gatewaygame.com SMTP config for registration
formatting and default email settings
registration related updated
fixing coverage stats for config and dependancies
possible fix
Merge pull request #96 from ChristianMurphy/fixing-coverage

fixing coverage stats for config and dependancies
Merge branch 'develop' of https://github.com/Team-H/gateway into develop
Merge branch 'develop' of https://github.com/JoeStratton/gateway into Production-Mail-Settings

Conflicts:
	configuration/settings.py
	configuration/urls.py
	controllers/__init__.py
	views/fragment/manager.html
	views/layout/base.html
	views/manager.html
	views/student.html
	views/teacher.html
	views/teacher_profile.html
resolving more conflicts
more fixes
Merge pull request #98 from ChristianMurphy/Production-Mail-Settings

Production mail settings
Set teacher url again
brought gateway.css back. removed/fixed anything that was originally overriding bootstrap
Setting up profile/teacher for demo
got confused on teacher, fixed url issue
Merge pull request #101 from BrandonSleater/develop

Demo Content: Profile/Teacher
Merge pull request #99 from davisk/develop

added new options page
hooking up user data to profile. making profile generic to both teacher/student
Merge pull request #102 from BrandonSleater/develop

User profile data and DRY on profile for teacher/student
pep8 fixes