Corrected to account for large numbers of tags
Merge branch 'master' of https://github.com/vipasu/Piclet

Conflicts:
	Piclet Framework/js/photos.js