whoops, make this change on my branch so it kicks the build off instead of master branch
Merge branch 'devbranch-dhiller' of github.com:deanhiller/databus into devbranch-dhiller
Merge branch 'master' into devbranch-dhiller

Conflicts:
	webapp/app/controllers/modules2/SplinesPullProcessor.java