started populate file
fixed Gemfile
move Gemfile changes
fixed the Gemfile and testing error
Merge branch 'recov' into a
Fixed testing troubles, activeldap vs active record generators, and added contact_list model
Merge branch 'steve' into dylan