Apply working changes
Clean up dotfiles
Merge pull request #11 from adjl/wip

Clean up dotfiles