Fix logos and add tests on the to avoid fails when reformating source code (ping @mageekguy :p)
Merge pull request #196 from jubianchi/master

Fix logos, thanks @marmotz and @jubianch (and kick my ass ;))