Update at Fri Jul 12 05:04:44 PDT 2013
Merge branch 'master' of github.com:lge88/dotfiles

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