Merge remote-tracking branch 'upstream/master'

lol
got feature selection working, documented real nice, added command line arguments and params