Format header includes nicely

git-svn-id: https://plugins.svn.wordpress.org/ml-slider/trunk@889425 b8457f37-d9ea-0310-8a92-e5e31aec5664
Enable No Conflict Mode by default

git-svn-id: https://plugins.svn.wordpress.org/ml-slider/trunk@889426 b8457f37-d9ea-0310-8a92-e5e31aec5664