updated text
Merge branch 'mquandalle-jade'
added basic testing support
refactoring and adding tests
added travis support
Fix jade support