tidy: Aggressive compression and ref packing
jmake: Java 8 and mvn 3 are the default; java 6 and mvn 2 are options
nmake: use python 2
utils: bump mvn 2 version to 2.2.1
tigrc: disable graphics as they make tig SLOW
vimrc: a few colourschemes and additional syntastic settings for java 8

Conflicts:
	.vimrc
notes: simplify it - no fancy colorscheme
update-cic-error-messages: use python2
gitconfig: add git built related aliases