added getCurrentLocation but throws null pointer Ex
Refactored some code and did more cleanup
Fixed a few bugs, more to fix still though
got GetCurrentLocation Working
fixed conflicts
starting dsl factory
confirmed GetCurrentLoc / merging bryces branch
Merge branch 'bcartman'