tim's stuff
Merge branch 'master' of https://github.com/logicmason/mosaiq