broken stuff for vitter
Merge branch 'master' of https://github.com/dssg/bikeshare
merge