Fixed some redirect bugs, etc with malik
before presentation additions
latest changes
Merge branch 'jeff' of https://github.com/Oob/InternshipMatch into tom

Conflicts:
	controllers/profile.py
	models/db.py

added more sets for fields in tables
stop tracking
no message
pre pop data file is finished. Populates all tables with some data including needed auth tables. added set for states for company table
registration_key fix and a few table additions
merge with master
merge