finish scanner
fix typos
Merge branch 'master' of github.com:nicball/eli