Fix bug in uncomment_lines.

If a blank commented line precedes a line to be uncommented,
then it does not get uncommented properly.
Merge branch 'master' of git://github.com/tomasv/thor into tomasv-master