now handles user input of date+time that's before datetime.now
code cleanup
Merge branch 'develop'