Fix functional tests for history
Fix functional tests for history

This moves two tests for the show action into the correct part of this
functional test file, and changes the history test to request the
history action now instead.
Conflicts:

	test/functional/artefacts_controller_test.rb

theodi/panopticon,theodi/panopticon,theodi/panopticon,theodi/panopticon