initial sane-ish commit
Pull station locations and bike availablity via ajax
fix to work with wsgi
Merge branch 'master' into dramage_maps

Conflicts:
	bikeshare.py
	templates/base.html
	templates/index.html
merge head
change to reflect new app name
fix layout
Merge branch 'master' into dramage_maps_merge

Conflicts:
	bikeshare.py
Merge branch 'dramage_maps_merge'