update to jquery 2.1.0
add discretized sites to arg-sim
only index layout if it is bgzipped
codequality
improve gtest install
apply mjh patch for recomb sampling
codequality
separate out recombination point enumeration
fix recomb sample and add test
fix recomb near root case
fix recomb sample for internal branch case and add test
add doc for running c++ tests
Merge branch 'sample-recomb' into staging
Merge branch 'staging' into tmp

Conflicts:
	src/recomb.cpp
codequality model.h
remove tabs
Merge branch 'sample-recomb' into staging
implement set times from file
Merge branch 'mjh-simple' into staging
Merge branch 'staging' into mjh-contrib

Conflicts:
	src/arg-sample.cpp