Add artists' "show my current workload" and "show my finished bounties" filters to views.
Merge branch 'master' into artist-filters
Merge branch 'master' into artist-filters
Add the ability to disable filters when other filters are used.

Some filters are mututally exclusive to others, so a JavaScript function
now exists to allow filters to easily turn off other filters
temporarily.
Clean up the filters view by using Rails helpers to generate tags.
Update back-end to accomodate slightly changed filter names and parameters.
Make bounty sorting in the index view work. Bounty's default sorting is now by score.
Implement backend support for the workload and portfolio filters.
Fix some bugs in the complex logic to disable and re-enable filters by other filters.
Add tests for the artist_workload filter.
Changed accepted and completed bounty factories from child factories to traits.
Bounty factory no longer generates extra artists or moods when artists or moods are explicitly passed to the factory.
Added favorite star tests
Added vote tests
Revise the artist workload filter tests.
Add tests for the artist portfolio filter.
Merge branch 'artist-filters'
Update some tests to work with new bounty factories.
Remove a stray comment.
Merge branch 'master' into artist-user-dashboard

Conflicts:
	app/views/layouts/_filters_controls.html.erb