Merge branch 'fix_watcher_option_tags'

Conflicts:
	hamlpy/hamlpy_watcher.py
Merge branch 'jinja_compat'
Merge branch 'master' of github.com:Naddiseo/HamlPy

* 'master' of github.com:Naddiseo/HamlPy:
  remove unused test templates
  - Added a basic testcase and output.
  Added to test to confirm fixes issue #125
  Add tests around javascript filter with attr set
  Escaping attr_wrapper instead of hard-coded apostrophe.
  Changed filters to use attr_wrapper instead of hard-coded apostrophe.
  fix readme
  How to generate translation files.
  fix parser source string to unicode
  Fixed #116
  Tests to demonstrate #116.