Fixes for install
Merge branch 'master' of https://github.com/brousalis/dotfiles

Conflicts:
	Rakefile
	home/aliases
Fixing deps