some apt-get convenience installs
Ubunutu install java
Merge branch 'master' of github.com:jfred/dotfiles