Added a little more .tmux.conf love; added .bashrc
Merge branch 'master' of github.com:nuttycom/nuttyconf

Conflicts:
	.tmux.conf
Unifying vim config.
More vimmery!