stuff
getting docs to build without warnings
Merge branch 'justin/master'

Conflicts:
	src/hyperloop/test/test_tube_temp.py