fixed java version for mac and linux, added alias for mvim
fixed but undoing a dodgy commit...