Commented out tri-factory pre-cond for now
Merge branch 'master' of github.com:amccann/Rubix