include future package, seems to be needed for forms builder?
Merge branch 'django' of https://github.com/sardawson/portal into django

Conflicts:
	requirements.txt
pyc bad
style changes for registration and login pages
fix bad check in
fix bad check in
Merge pull request #17 from sardawson/django

Thanks Sarah!