Merge branch 'master' of github.com:williamlao/.emacs.d
testing case files for mac hfs