Put in votes. Also tidied up some stuff
Merging seafish branch