move non-java 1.8 fixes on BEAUti to branch 2.1, including issues #191, #192, #194, #196
move non-java 1.8 and modify 1.8 into 1.6 to branch 2.1, including issues #214, #215, and Alexei's tidying