Converted to linux stle line endings
Adding gitignore
Merged Makefile changes from user_id_migration
Merge branch 'master' into staging

Conflicts:
	mind-well/Mindwell/Client/views.py
	mind-well/app.yaml
Created requirements.txt
Some changes for building on new VM
More changes for using virtualenv
Prep for travis ci
Fixing path to files for tests
Added .travis.yml
Fixes for travis
Hooking up to coveralls
Added travis and coveralls badges