merge readme conflicts
uh rename these. oops
and remove these
git autocomplete and other laziness
clean up
readme too
Merge branch 'master' of github.com:ian29/dotfiles