Updated custom load files
Changed directory locations of org files
Merge branch 'master' of github:jkglasbrenner/.emacs.d