Work-in-progress on user account merging
Tests for user merging and support for merging profiles
Fix method name
Remove 2.6 support since we don't use it anymore.
This is significant enough to merit a version bump.
Unicode fix and renamed variables for context
Use positional parameters for helper_method + some re-org
Misc fixes to make mergeuser work in client apps
Merge pull request #13 from hasgeek/mergeuser

Merge user accounts in client applications