Update the project .gitignore file to exclude OS-specific metadata files.
Update Persona login to use the latest Persona API.
Merge branch 'master' into login-sessions-devel

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb