Additional Tests, Improved Conditional Comment Support

Added numerous new test cases and improved conditional comment support. New lines are now more intelligently added around conditional and license comments, in that they only appear when they already exist but don't otherwise.