Merge branch 'master' of https://github.com/trcook/tmisc

Conflicts:
	.gitignore
	tmisc/R/my_build.r
	tmisc/man/my_build.Rd
Merge branch 'master' of https://github.com/trcook/tmisc