clean up
prepair to merge
merge in office work

Merge branch 'master' of https://github.com/mjsduncan/Rmoses

Conflicts:
	R/hlungtx_2.R
	R/moses.R
Merge branch 'master' of https://github.com/mjsduncan/Rmoses
clean out old crap and try out code for mashing best of results