Some refactoring; updated README
Merge branch 'master' of github.com:barr-code/FAAST