Merge pull request #7 from jpkeane/master

Rebase Calliope
Moved include to outside action
Merge branch 'bug/500-on-404' into calliope
Merge pull request #13 from jpkeane/calliope

Calliope