1.忽略eshell文件夹的内容。
2.autocomplete增加yasnippet的ac-source
* .gitignore:
Merge branch 'master' of github.com:csophys/emacs.d
合并分支

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.