commiting is fun
deleting information_types now working
added actor-delete feature
Merge remote-tracking branch 'origin/master' into delete_redundant_urs

Conflicts:
	config/routes.rb
the new actor routing sucks balls
Merge remote-tracking branch 'origin/delete_redundant_urs'
Merge branch 'master' into relationship_wizard