The new JSONEncoder is working and most of the API functions are updated
to use it.  Errors might result from not using key/value pairs in
jsonify()
Merge branch 'master' of github.com:noahgoldman/textlink

Conflicts:
	server/textlink/views/api.py
Fixed merge
Fixed gitignore and removed uncessesary mac files