fix for regression introduced in f6de3cb

org may only be require'd AFTER the load-path is set up
Merge branch 'elpy' of github.com:chaoflow/.emacs.d into elpy