Merge branch 'fhaynes' of https://github.com/willametteuniversity/webcirc2 into hparker

Conflicts:
	webcirc2/__init__.pyc
	webcirc2/settings.pyc
	website/serializers.py
	website/urls.py
	website/views.py
Merge remote-tracking branch 'origin/hparker' into hparker

Conflicts:
	webcirc2/__init__.pyc
	webcirc2/settings.pyc
	website/serializers.py
	website/urls.py
	website/views.py
Merged in changes, fixed pep8 spacing, removed unneeded imports
Finished API outline, unit testing and fixing