remove FactoryGirl deprecation warnings
clean-up #reservation_form helper
upgrade rails to 3.2.11