Non local error pages
Merge pull request #4 from jbrewton/feature/error_handler

Non local error pages
merge dev