Fix zip import rake task
Merge branch 'master' of github.com:mission-of-mercy/mission-of-mercy
Merge remote-tracking branch 'upstream/master'