added molokai vim colorscheme, included a .tmux.conf file
Merge branch 'master' of https://github.com/abrandemuehl/rcfiles
Fixed merge

Conflicts:
	.vimrc