Merge pull request #19 from smcadams86/master

merging this myself as this is a trivial change. did a pull request for visibility.
Misc: Clean up xml imports and syntax error
Merge pull request #20 from arudge/master

Misc: Clean up xml imports and syntax error

I used annotations to pick up bean definitions. I'm a bit concerned this may break the test suite and/or execution.