Removed character check line now that it is not being returned in the collection name.
Reduced the load of testExportOrganization so that it won't take as along or crash the embedded cassandra instance.
Fix for problem in unique values implementation in Core Persistence, and tests to verify new fix.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'master' into two-dot-o. Also making log configs consistent.

Conflicts:
	.gitignore
	portal/dist/usergrid-portal/index-debug.html
	portal/dist/usergrid-portal/index-template.html
	portal/dist/usergrid-portal/index.html
	portal/dist/usergrid-portal/js/libs/usergrid-libs.min.js
	portal/dist/usergrid-portal/js/libs/usergrid.sdk.js
	portal/dist/usergrid-portal/js/usergrid-dev.min.js
	portal/dist/usergrid-portal/js/usergrid.min.js
Couple more Core Persistence test fixes.