New modules
Add local bashrc
Merge branch 'master' of https://github.com/lovasoa/dotfiles

Conflicts:
	.bashrc