fixing up views and forms
Merge branch 'master' of https://github.com/jmccarth/mad-booking