Changed flickr API url to stop the key from expiring.
Merge branch 'master' of github.com:Jellyfishboy/tomdallimore

Conflicts:
	wp-content/themes/tomdallimore/assets/js/application.js
	wp-content/themes/tomdallimore/assets/src/coffee/application.coffee