fixed extra <cr>
re-branched from master
Merge branch 'ubuntu' of github.com:shawndumas/dotfiles into ubuntu