removed diary and emacs.org from tracking
Merge branch 'master' of github.com:NSchweers/emacs.d