Removed Gaffe as error handler
Added own error handler - Closes #33
Merge branch 'bug/remove-gaffe' into calliope