updates!
Merge branch 'master' of https://github.com/wmayner/dotfiles

Trying out git amend (>_<)
shortlog -sn