Merge pull request #3 from willametteuniversity/fhaynes

Fixed a syntax error. Fixed a missing __init__.py.
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
Needed to specify content type and use json method to serialize json for put request
Finished action type API as well
Resetting csrf decorators for now, adding item history api
Merged with fhaynes
Adding fixtures, user fixtures not done
Created User fixture
Merge pull request #10 from willametteuniversity/hparker

Added users fixture