Reorder else-if-statement for cleaner code

Same functionality as discussed in https://github.com/gruntjs/grunt-cli/pull/48 - but a more clean implementation :-)