Fix for Syllabus dupe error
Fixed registration stuff as per issue #8
Merge branch 'hotfix-0.2.5'