add gitignore for emacs temp files
add $JAVA_HOME for JRE7 installed on OSX
revert magit to 1.2.0 - this helps keep the commit message populating script working