Fixed bug in block selection. Changed templates so they don't
auto-insert.
Authored by: Stuart Moodie 2016-08-05
Parent: [37df5a]
Child: [e2940b]