added C things and tmux aliases
Merge branch 'master' of github.com:dpeticol/.dotfiles

Conflicts:
	vimrc
merged with master