Some generalisation attempts
Merge branch 'master' of https://github.com/izimbra/PLT2014
More generalisation attempts, removed `mini` and other unnecessary files