cosmetic fix: warning message and comment
unused var
wrapped line
Merge pull request #152 from petricek/bstypo

cosmetic fix: warning message and comment
Merge pull request #153 from petricek/cleanup

some more cleanup
modify weighted average to work with norms properly
Zero the ngram and skip arrays before use
Merge pull request #154 from martinthomas/master

Zero the ngram and skip arrays before use
Output a warning when binary and raw options are both specified
Merge pull request #155 from martinthomas/master

Output a warning when binary and raw options are both specified
fix bs_type and desc
Merge pull request #157 from petricek/bs_type_fix

changed --bs_type to <string> to allow specifying 'vote' or 'mean'  updated help description
regression tests for bootstrap
reference outputs
explicit example formats w/ feedback about ambiguities
add the tagged example
Merge pull request #159 from someben/master

explicit example formats w/ feedback about ambiguities; add the tagged example
Merge pull request #158 from petricek/bs_tests

regression tests for bootstrap
Merge remote-tracking branch 'upstream/master'