Committing my changes from before as well as Ray's changes to views.py
Merge branch 'master' of https://github.com/wheelerl1992/frankenstein

Conflicts:
	frankenstein_mobile/api/views.py