Change Vagrantfile to reflect changed ruby in the virtualhost.
Add validator for length of description on person model [fixes #93]
move validator message to en.yml
Add description to profile page next to name
remove emdash if person description is blank
moved description, still may not be the best place for it
Merge branch 'master' of github.com:churchio/onebody
Fix comment controller test.
Add hostname to Settings screen [fixes #94]
Fix date issues [fixes #97, fixes #73]

Conflicts:
	config/locales/en.yml
Merge branch 'master' into checkin-kiosk

Conflicts:
	config/locales/en.yml