Remove trailing whitespace :D
Add misc.vim
Add notes.vim
Fixed prompt for multiple versions of git status command.
Merge branch 'master' of git://github.com/tmhorne/dotfiles into tmhorne-master

* 'master' of git://github.com/tmhorne/dotfiles:
  Fixed prompt for multiple versions of git status command.
Merge branch 'tmhorne-master'

* tmhorne-master:
  Fixed prompt for multiple versions of git status command.
Set notes directory
Use Meslo LG M in GUI vim
Merge branch 'patch-1' of git://github.com/simonowendesign/dotfiles-1 into simonowendesign-patch-1

* 'patch-1' of git://github.com/simonowendesign/dotfiles-1:
  Remove trailing whitespace :D
Merge branch 'simonowendesign-patch-1'

* simonowendesign-patch-1:
  Remove trailing whitespace :D
Whoops: plugins → plugin
merge