Integration tests for training paths v2
Merge branch 'master' of https://github.com/wesmangum/zss

Conflicts:
	spec/adding_training_paths_spec.rb