changed dir name (no end /) to please homebrew
Merge branch 'master' of github.com:giuliop/dotfiles

Conflicts:
	.bashrc
added p4merge as default merge tool