*added optional template_type argument to command     line  arguments and all relevant classes/functions; django     is always default

  *generalized identifiers; replaced 'django' with 'template'        in all relevant variables

  *added full range of tests for web2py

  *added optional template_type argument to hamlpy-    watcher, defaults to django

  *no django-based functionality was changed (except     tag_name split, see final bullet)

-Added support for inline CoffeeScript tags with :coffeescript; works same as :javascript

- Converted tag_name split to use '\w+' regex instead of plain ' ' so it won't break if extra spaces are inserted

*added optional template_type argument to command line arguments and all relevant classes/functions; django is always default

*generalized identifiers; replaced 'django' with 'template' in all relevant variables

*added full range of tests for web2py

*added optional template_type argument to hamlpy- watcher, defaults to django

*no django-based functionality was changed (except tag_name split, see final bullet)

-Added support for inline CoffeeScript tags with :coffeescript; works same as :javascript

- Converted tag_name split to use 'w+' regex instead of plain ' ' so it won't break if extra spaces are inserted