updated
Merge branch 'master' of https://github.com/hayesla/eitwave

Conflicts:
	data_hough_detect2.py
	eitwaveutils.py~
	sim/__init__.pyc
	sim/wave2d/__init__.pyc
	sim/wave2d/wave2d.py
	sim/wave2d/wave2d.pyc
	sim/wave2d/wave2d.py~
	test_hough_detect.py
	test_hough_detect.py~