Updating regex to fix conditional mangling

fixes #263 ??

Slight edit to regex so that comments can still be on same line
Merge branch 'master' of https://github.com/zeppocreative/grunt-usemin