streamlines cukes
cleans up settings after scenario
update changelog
Merge pull request #308 from opf/fix/arbitrary_failing_cuke_timelines_navigation

Fix/arbitrary failing cuke timelines navigation
Merge remote-tracking branch 'opf/feature/rails3' into feature/disable-modals-in-timelines

Conflicts:
	doc/CHANGELOG.md