Updated branches
Merge branch 'master' of github.com:roaet/dot-files