Merge pull request #1 from jgoley/jonathan

Jonathan
Merge pull request #2 from jgoley/jonathan

Implements flickr API
Adds Map
Merge pull request #3 from tbarth17/tommy

Adds Map
Changes templates
Merge branch 'jonathan'
Fixes ajax request and template function
Removes filler images from flickr-content
Adds styles to float flicker image containers
Adds jquery hammer bower dependency