added optimiser to top-level imports
fixed some merging behaviour
Merge remote-tracking branch 'upstream/master'

Pulling in simulator
added script to run optimiser
Merge branch 'master' of github.com:mgperry/treeCl
Merge branch 'master' of github.com:mgperry/treeCl
new results format
new runtime for opt
script to run clustering from cli
fixed records/collection confusion in plotter
.
process multiple folders
split working but nclusters bugged
removed globals from opt; added merge/split algorithm; changed resampling
split and merge optimisation now working
hierarchical clustering method
history now optional
print statements
added get_partition function
Fixed possible bug with 1-member clusters and fixed incompatible cl params