Fix 'end' highlighting for functions

Fix #21

Add missing word boundary tags.