Merge branch 'master' of ssh://yt/afs/acm/sig/lug/projects/vending
add vote info to example conf
fixed a bug with web code and also fixed all my vim mistakes