klaatu fixes
small improvements
mergingMerge branch 'master' of github.com:joshmarinacci/aminolang
blah