added --local flag
cleanup
bugfix
bah
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
Revert "Merge branch 'python' of https://github.com/diging/tethne into python"

This reverts commit bbb26062ee73568f1c53a474e499dbea8fe0b6eb, reversing
changes made to d88e10b1044a758b5fe0f7829e7effc1188b1d49.
fixed repository problems
Merge branch 'python' into webapp_feb24

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