moving things around
Merge branch 'master' of https://github.com/tbates/umx

Conflicts:
	R/misc_and_utility.r