Update .bashrc

Deleted the colorful settings for the console since it breaks either way when ssh into a remote box...
Added .bashrc to Makefile
Merge branch 'master' of git://github.com/victor-rocha/dotfiles

Conflicts:
	Makefile