Cleaned up some code

This merge brings us back to square 1, in terms of the transaction problem we encountered this week. However, a lot of the controller service layer code should be more consistent. Also, the xml configs (dispatcher-servlet.xml in particular) are much more readable.