updated logo to smooth version
Merge pull request #133 from adamralph/logo

updated logo to smooth version
Merge pull request #134 from xbehave/master

catch up dev with master