work out JAVA_HOME on per system, set perforce user
updating install packages; removing perforce from prompt
change the TERM parameter to screen; use the git log god mode alias :)
resolved merge conflict
formatting of doppio
merging from branches
change to doppio help string; nicer git log
Merge branch 'master' into binky