Fix module name handling in `--main`

Not sure how I missed this originally, it was obviously completely
wrong!
Remove unnecessary pattern
Merge pull request #215 from garyb/master

Fix module name handling in `--main`
Merge pull request #214 from joneshf/psci-fixes

File loading.
Start on parser module.
Cleanup parser a bit.
Started parsing commands.