fix conditional to not break linux
Make initial updates for Java development and some emacs tweaks