add scala stuff
ignore var and backup folders
change e-mail folders
misc stuff I missed
Merge branch 'customizations' of github.com:cbilson/prelude into customizations

Conflicts:
	personal/custom.el