add flickr keys switch back in
Merge branch 'master' of https://github.com/gregerg/Global-View