Merge pull request #54 from xfq/master

Some minor fixes.
Moved ergoemacs-dir up so that it doesn't have an error on my startup.
Added prompt for killing org-mode source-editing buffers
Merge remote-tracking branch 'upstream/master'
Remove redundant `symbol-value'.