work out JAVA_HOME on per system, set perforce user
better backup behaviour; cmake syntax highlighting
updating install packages; removing perforce from prompt
emacs changes; upgrade to java 7
yes-or-no-p
change the TERM parameter to screen; use the git log god mode alias :)
resolved merge conflict
formatting of doppio
merging from branches