Merge pull request #112 from candrews/1.6.x

Updates to the Grails plugin
deleted old tomcat and hibernate plugins
deleted unused files
cleanup
fix merge conflicts