[#62820480] cleaning up code
Merge branch 'erick' into python

Conflicts:
	.DS_Store
	tethne/networks/__init__.py