version bump submodule
merge conflict
add remove primitives to the resources
Merge pull request #30 from rackerjoe/master

Merged automatically by jenkins after successful build test