Merge pull request #3 from wasabii/cogito-develop

Cogito develop
Merge pull request #5 from wasabii/develop

Develop
Merge branch 'develop'
Removed Mvc and Nacy stuff pending fixes.
Merge branch 'master'