add short option -B for --bootstrap
make option headers capitalization consistent
move comment on data-file without -d to where it belongs
Merge pull request #304 from arielf/master

add short option -B for --bootstrap