making stuff display correctly
Merge branch 'master' of github.com:bikecomps/simulation

Conflicts:
	views/static/js/bikeshare-custom.js