Removed the dual properties file, and now we have all the properties mer...

...ged into usergrid-default.properties. Updated the core persistence setup to reflect the change.