Added server side check for same account merges, and fixed some formatting.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>
Added ability to work with non-migrated databases.

Signed-off-by: Tyler O'Meara <Tyler@TylerOMeara.com>