Merge branch 'refs/heads/develop-fftf'
Merge branch 'refs/heads/develop-fftf'
Merge branch 'refs/heads/develop-fftf'
Merge branch 'develop-fftf'
Merge branch 'develop-fftf'
install honeybadger
Merge branch 'refs/heads/develop-fftf'
Merge branch 'refs/heads/develop-fftf'
Merge branch 'refs/heads/develop-fftf'
moved list cutting to blaster queue
Merge branch 'refs/heads/develop'

Conflicts:
	app/controllers/admin/list_cutter_controller.rb
Merge branch 'develop-fftf'
Merge branch 'develop-fftf'
Merge branch 'develop-fftf'
Merge branch 'refs/heads/develop-fftf'
Rename opt in fields to a more generic logging use, ip address and
referer url (honoring known http referer header mispelling).
Use Clouflare connecting IP header to record ip address if it exists.
Merge branch 'develop-fftf'
Merge branch 'develop-fftf'
Merge branch 'develop-fftf'