Newest permutation programs etc
Merge remote-tracking branch 'authority/master'

Conflicts:
	src/new/vnonparam_cluster/CMakeLists.txt
	src/new/vnonparam_cluster/vclusterhist.cpp
	src/old/vgendesign/vgendesign.c
Merge branch 'master' of github.com:lipsia-group/lipsia
Merge branch 'master' into slicetime_fix