Git config vimdiff as diff tool
emacs - add guru-mode package
Ubuntu - update vagrant to 1.6.2
Ubuntu setup - add node by ppa
Add hour in bash ps1
Merge branch 'master' of github.com:beltrachi/dotfiles

Conflicts:
	ubuntu/scripts/setup.d/devel.sh