Updates for OnTime #1351, #1352, and #1353
Fixed conflict
Deleted unneeded block alter
Fixed line ending
Deleted JS file
Merge pull request #41 from daniel-dgi/7.x

7.x
Deleted JS file
Merged conflict in README
Merge pull request #40 from jamesgardham/7.x

Updates for OnTime #1351 and #1353
drush changes
Merge branch '7.x' of https://github.com/discoverygarden/manidora into 7.x