up docs
Merge branch 'master' of github.com:CaffeinaLab/Trimethyl

Conflicts:
	updocs