Update permalink style
Update watch task to consider includes and posts
Test updated permalink style and watch task