Intermediate commit
More Spring XML cleanup
Merge pull request #163 from futures/SpringShortcuts

Spring shortcuts - looks good to me.