Usergrid 182 properties consolidation

Removed the dual configuration files , and merged them into one.