aa_256 command
git alias cm
misc stuff

Conflicts:

	tmux/tmux.conf
	vim/vimrc