Add git alias for merging.
Merge branch 'master' of https://github.com/delynn/dotfiles

* 'master' of https://github.com/delynn/dotfiles:
  Fix git branch autocomplete.
  Remove sublime aliases since we now use the sublime plugin.
  Moar plugins, and fix load order.
  Update license.
  Add new aliases.
  No longer using pow.

Conflicts:
	gitconfig