Specify type of input in event
Merge branch 'octopus' of git://github.com/richardingham/blockly into octopus