Supermarinification of everything.
Merge pull request #164 from neonichu/supermarin-all-the-things

Supermarin ALL the things!