Merge pull request #1 from timthelion/master

We use our own internal format now-a-days
Merge branch 'master' of https://github.com/subuser-security/subuser-default-repository