7.x 3.x location and update master display

I updated the master display to be relevant (same as the page display) in event views. I also added a location to the exposed filter. 
I may have messed things up since I brought it in from the art branch instead of directly from 7.x-3.x. On the art site all the permissions were set to 755. I tried to change them back to 644, and it appears I missed a couple files. There may be other things that changed as well.