fixed travis
updated gitnore
Merge branch 'develop' of https://github.com/jonniespratley/generator-jps-site into develop
updated templates
Merge branch 'develop'