gets rid of all hard coded key strings
Merge branch 'master' of https://github.com/AllegianceZone/Allegiance