Merge branch 'develop' into riseAndSet
re-added: wunderground-2013-03-29.json
Merge branch 'riseAndSet' into develop
Merge branch 'develop'