Massive refactoring (and still not finished!)
Merge branch 'master' of git://github.com/BobLoco/architect