output after running bundle --binstubs
db/schema.rb should be in version control
files that should not be in version control

added to .gitignore
use capistrano to deploy application

this uses bcdatabase for deployment configuration
requiring an /etc/nubic/db/LATTICEGRID_INSTANCE_deploy.yml file
to exist on the deploying computer.
annotate models
deploy:restart action
act as a rack app
ignore development files
rhlccc faculty import/update
changes to allow first_names to be updated
Description of deployment and config file
update capistrano deploy configuration

set the linked directories
set bundler properties
use capistrano extra projects

capistrano-bundler and capistrano-rails
choose branch to deploy
no need for assets - this is still a Rails 2 app
Merge branch 'feature/capify' into develop
Merge branch 'master' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	db/imports/RHLCCC/new_faculty_Sept2013.txt
Merge branch 'develop'
Breslin and Siddique were missing in database

Siddique was in the May Membership Roster and
Breslin was in the September Roster.

I added these two and then ran the Program
Member import using the Oct2013 file.
added RAS project. Not sure why so many files have been marked as changed