fixed flickr api, map centering issue seems to be fixed after I cleared my cache and ran another npm install which reinstalled the grunt build.  Ngdialog popping up haphazardly also seems fixed from the cache clear and npm install. Need further testing to confirm
Fixing merge conflicts
Got map view populating pins based on current day's activities.  ALso, commented a lot of factories and controllers