finished consolidating source filenames and error checking
Merge branch 'dev' of https://github.com/danig/eno into dev