Config in a separate file (fixes #2 and fixes #3)
Merge branch 'master' into noconv
Bigger logo