Updating files
Merge branch 'master' of github.com:adam-may/dotfiles