Hai der
Merge branch 'master' of https://github.com/sgardn/blackwood

I don't like vim yet..