Adds an interface for creating conventions
Tweak version number
Merge branch 'develop'
Merge pull request #6 from carcer/master

Adds better support for activating conventions