Cleaned up file-reader and atom-type checking
Merge branch 'master' of https://github.com/andersx/noe-way-jose