Updated aliases and tmux.conf
Merge branch 'master' of github.com:msafko/laughing-nemesis

Conflicts:
	bash/.bashrc
	tmux/.tmux.conf