v update
man got left out
merge resolve

Merge branch 'master' of github.com:jread-usgs/glmtools

Conflicts:
	DESCRIPTION
merge resolve