minor merge conflict
benchmark now outputs report
dataSplitter now outputs pickle of indices for test and training data
add settings.py to .gitignore so it doesn't keep getting committed.