JMML remove didn't take the first time.  Also removed version control piece that intellij added for me.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5119 b35dd754-fafc-0310-a699-88a17e54d16e