Merge pull request #31 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
End of sprint version bump.
ENHANCEMENT: Default to Folsom
Merge pull request #32 from rackerjoe/work

Merged automatically by jenkins after successful build test