changes for the new laptop.
Merge branch 'python' of https://github.com/diging/tethne into python

Conflicts:
	flask/login copy.py
	flask/storage/users.fs.lock