Fix "Not a SCALAR reference at .../CPAN/Meta/Check.pm line 35."
modelines for vim
whitespace for readability
testing for conflicts
add another check for exact conflict version
another conflict test, showing a passing case
Merge pull request #4 from karenetheridge/topic/fix_conflicts_checks

Topic/fix conflicts checks