refactor watchpoint.lua and implement correct 'untrap'
change travis.yml to test multiple version of luajit