Fixed snippet to not insert extra newline.
Added better font handling on the mac.
Merge branch 'master' of https://github.com/drwells/emacs-files

merge in changes from master.
Merge branch 'master' of https://github.com/drwells/emacs-files

# 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.