Initial checkin
Remove conflict
Merge github.com:jfnixon/dotfiles