truffle shuffling some code, adding tests arround stationName/stationAbbreviation
truffle shuffle
merging master in, minor bug fixing