PHPCS ignore tweak
Fix jshintignore recursive directories
Merge develop into issue-668