Update the project .gitignore file to exclude OS-specific metadata files.
Fix a typo in the sidebar placeholder filters.
Fix minor issues in Personality tests.
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
Add the nginx.conf needed to support this project on a production server running nginx.
Merge branch 'interface'
Merge branch 'master' into bountyCreate
Update gems to latest versions.
Merge branch 'master' into bountyCreate
Implement the ArtistDetail class for user information that only applies to artists.
Merge branch 'bountyCreate' of github.com:lionheartstudio/bountyboard into bountyCreate

Conflicts:
	app/views/bounties/new.html.erb
Give the new bounty view access to the list of existing artists so users can choose which artist may complete the bounty.