increased perm gen space for tomcat7 to 512mb
Merge branch 'master' of code.dtg.cl.cam.ac.uk:infrastructure/dtg-puppet
Update README's TODO list as some things have been done