Fixed syntax errors in unit tests
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
Updated gemfile
merges
Merge branch 'stage' of https://github.com/stevemcquaid/boa into stage
Some test stuff
fixed testing issues by specifying minitest version
fixed test_helper, added Organization routes and index page, and initial version of populate script
added controllers and bootstrapped views for models and changed populate script to add default user accounts
Check-out and check-in tools working.  More view changes to remove created_at and display text for foreign keys instead of ids
Merge branch 'stage' of https://github.com/stevemcquaid/boa into stage
jenkins deploy script
updated deploy
updated settings for jenkins