removed ack alias added syntax changed tab + eol chars
default
obsolete
Merge branch 'master' of git://github.com/jgiudicelli/dotfiles

Conflicts:
	.tmux.conf
	.vimrc
	.zshrc
gitconf