Remove long lines for better formatting
Use ansi standard CURRENT_DATE rather than its alias NOW()
Merge pull request #66 from timschofield/develop

Develop