prepare for preferences/rules move

git-svn-id: svn+ssh://tarsonis.eecs.harvard.edu/var/svn/repos/turkxperiment@297 3a57de58-d725-46f4-af88-d244e1e090f1
prepare voting rules for move, again

git-svn-id: svn+ssh://tarsonis.eecs.harvard.edu/var/svn/repos/turkxperiment@298 3a57de58-d725-46f4-af88-d244e1e090f1
rebase voting rules
Merge branch 'master' of github.com:mizzao/libmao