Marmalade didn't work today
Merge branch 'master' of github.com:stianalmaas/dotfiles