uncommitted fixes
Merge branch 'master' of github.com:mcartmell/merlion

* 'master' of github.com:mcartmell/merlion:
  minor fixes
  update readme