snowfall
Merge branch 'master' of https://github.com/jonhare/WAISFest13

Conflicts:
	FlickrVisualisations/src/main/java/uk/ac/soton/ecs/wais/fest13/FlickrCSVStream.java