updated rvm
merged in MBP bash profile
enable terminal colours for ls command
default java to jdk7
default java to jdk7
Merge branch 'master' of macmini:git/dotfiles