Fixed default problem in fetch_station; include no argument for agg_type to get reduced granularity resampling rather than aggregated resampling
Merge branch 'master' of https://github.com/dssg/bikeshare

Again with the idiocy. Should always pull before staging to commit