minor
Merge branch 'python' of https://github.com/diging/tethne into python

Conflicts:
	.DS_Store