created hotpants-merge to handle sentence generator module
Merge branch 'master' of github.com:AKAMEDIASYSTEM/hotpants