fixed yamoto and updated gpeak's hours
better error message
Merge branch 'add_places' of github.com:bradjc/omnomnorth into add_places