added ll bash alias
changed git paths to personal account
added nvm path, brew cask, git aliases, changed vim config
added mathias's osx defaults as a reference
added some git aliases
added ll bash alias
changed git paths to personal account
added nvm path, brew cask, git aliases, changed vim config
added mathias's osx defaults as a reference
added some git aliases
added new submodule: cheat
added chromekill alias
added new paths for brew's php54
updated vim submodules
added update alias for mac, brew, npm, gem updates
Merge branch 'master' of github.com:codonnell822/dotfiles

Conflicts:
	bash/com.googlecode.iterm2.plist
[git] added diffmerge as default mergetool
Merge branch 'master' of github.com:codonnell822/dotfiles
added long format option to LICENSE.md
README.md
TransmitFavorites.exportedFavorites
backup_excludes.txt
bash
bin
git
lib
vim alias's
Merge branch 'master' of github.com:necolas/dotfiles