marginally better 500 page
Merge branch 'master' of https://github.com/balloonchallenge/balloonchallenge.org
bunch of fixes pre-launch
resolve conflicts