Merge commit 'b64e9770359aa1b3ee041650dac0c72272a7020a'
Merge commit '5a93eb08fa4260fd28a562ae845568d30721c3dc'
changes to get things working on barcrawls
fix video embed
Merge pull request #88 from joshh/master

SEO changed for barcrawls
fix mistake in getList pagination. not sure how this ever worked as it is
update slideshow to work with new vf
switched back to the way it was.
Merge pull request #89 from joshh/master

Fix pagination and change the slideshow to work with new vf
Merge remote-tracking branch 'upstream/master'