Fixed testing troubles, activeldap vs active record generators, and added contact_list model
Merge branch 'steve' into dylan