Merge pull request #5 from nbellowe/master

Merge Nathan's work
Correcting some naming and giving CURRENT a value
Merge branch 'master' of https://github.com/driabwb/hotshot

Conflicts:
	scripts/hotshot_control.py
Merge pull request #7 from nbellowe/master

30 second adaptation
Merge pull request #4 from driabwb/master

unnecessary commits