remove github username as it is obsolete
make shortcuts configurable, added raketask
Merge branch 'master' of github.com:mcb/dotfiles
Merge branch 'master' of github.com:mcb/dotfiles

Conflicts:
	README.rdoc