DisregardVote model
Deleting organisations creates a DisregardVote instance
Remove disregard column from orgs (replaced by DisregardVote)
Tests for correct organisation visits behaviour
Query for pertinent organizations (not disregarded more than 5 times)
Correctly group organization visits in to pertinent and non-pertinent
Return organization visit_count as well
Improve readability of organization sql construction
Merge branch 'wcmc-next' into disregard-vote

* wcmc-next:
  Update short_url.rb
  fixes for merge request use Devise's built in before_filter :authenticate_user! check for current user existence in does_url_belong_to_user?
  before_filter on ShortUrlsController and fixed tests
  moved does_url_belong_to_user? method from controller to model
  test for update short_url
  removed inline class for form
  edit short urls - server side
  client side implementation of edit short url
  Only allow @unep-wcmc.org emails to register
  Require users to confirm their email addresses
  Use visit ordering scope in ShortUrls display
  Scope to order ShortUrls by visit count
  basic implementation of choose short-name option
  splitted long line
  added debugger in development

Conflicts:
	Gemfile.lock
	db/schema.rb
Provide short url to org controller to allow disregard association to be
made
Merge branch 'wcmc-next' into disregard-vote

* wcmc-next: (44 commits)
  Remove retired views
  Working tests again
  Render new link partial from correct view set
  Susy depends on compass
  Move legend rendering in to client to separate responsibilities from application
  Refactor pie chart renderer in to class
  Remove extraneous divs
  Use correct semantic html tags, and update CSS
  Use classes instead of IDs, and remove unnecessary styles
  Remove help controller CSS (empty)
  Remove unneeded map css
  Remove unneeded compare page JS
  Remove unneeded libraries
  partial unfinished work on add-edit short_url
  add_link partial
  @no_urls_yet = false when signed out
  removing incorrect i tag from devize template
  fix on current_user.no_urls_yet? method
  current_user.no_urls_yet? only if user is signed in
  colors & header styling, list tweaking
  ...

Conflicts:
	Gemfile.lock
	app/views/short_urls/_organization_list_item.html.erb
	db/schema.rb
Merge pull request #4 from unepwcmc/disregard-vote

Disregard vote