Correctly set end times on conditions
Merge branch 'master' of github.com:ChrisMondok/cumulus
Remove logic to render one hour for a condition

Conditions always have a start and end time