added some git aliases
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
adding brew-cask and composer to default homebrew packages to install
adjusted `ll` alias to include group, parent dirs
[osxdefaults] Stop iTunes from launching when using the keyboard media keys
Merge branch 'master' of github.com:necolas/dotfiles
ignoring cheat program
updated computer & host name in osx script
merge upstream changes from necolas

Conflicts:
	bin/dotfiles
	lib/brew
	vim/vimrc