Links and stuff
Merge branch 'master' of github.com:m-martinez/dotfiles