This is a merge of the current and future (starting September 22nd 2013).  However, I am concerned about the GIS data (stop locations especially) and will probably run again this week.  As usual, after the 22nd, I will publish an un-merged version.  Unlike before, the stop IDs have changed for dates after the 22nd.  This may be fixed after I fix the GIS.
Merge branch 'master' of https://github.com/whatcomtrans/publicwtadata