chore(Package): Updates grunt-combine-mq
feat(Templates): Tidy up markup