Use bundle exec when checking jekyll version if the option is set

Also clean up a little code