changes to init
Merge branch 'ks2' into kabsch-sander
added some of the hbond code tests, and changes