various tweaks
version bump
fix merge conflicts
Add meta-Stackoverflow logo. Fixes #6
version bump