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
Merge pull request #4 from jgoley/jonathan

Fixes flickr API and template function
Adds jquery hammer
Merge pull request #5 from jgoley/jonathan

Adds jquery hammer
Adds horizontal scroll function