Merge pull request #4 from jgoley/jonathan

Fixes flickr API and template function
Adds jquery hammer