Update photoset, update prettyphoto, minor bug fixes
Merge branch 'master' of https://github.com/livestreet/livestreet