updating paths/cleaning up
merge

Merge branch 'master' of https://github.com/OHI-Science/ohimanual

Conflicts:
	README.md