make calling and person a m2m through calling_assignment model
fix a few oversights in the callings refactoring; update the update-script to import all the callings at the access level the bishop asked for; pull out a few lines of dead code;
fix a few things Aaron pointed out (<%=h is out, get rid of an extra DB call)
Aaron's way to reduce DB calls smells better than mine.
Merge branch 'callings'

Chose the later date for the version line of db/schema
Conflicts:
	db/schema.rb
Adding schema after rake db:migrate
Updating rails because of security vulnerabilities.