Updates for OnTime #1351, #1352, and #1353
Fixed conflict
Deleted unneeded block alter
Fixed line ending
Deleted JS file
Deleted JS file
Merged conflict in README
Merge pull request #40 from jamesgardham/7.x

Updates for OnTime #1351 and #1353