rule logic moved to glasir.build, some fixes
Merge branch 'cleanup-marcus' of github.com:iteego/glasir.demo into cleanup-marcus