Merging modules and moving to a 6.x branch.
Merge pull request #1 from ryanissamson/6.x

Merging modules and moving to a 6.x branch.