Moved some things about. Cleaner structure.
Merge branch 'master' of https://github.com/ihatemundays/MatrixTables