Disables line-ending normalization
Merge branch 'master' of github.com:adamkrone/dotfiles

* 'master' of github.com:adamkrone/dotfiles:
  Changes editor to vim
  Adds marks
  Adds jade syntax highlighting for vim
  Adds tmux config