Refactored for XDTweet
Merge branch 'master' of github.com:dturanski/SpringOne2013