Remove unneeded kaminari bootstrap dir
Add outpost-secretary mounted routes
Merge remote-tracking branch 'origin/master' into mounted-routes

Conflicts:
	config/routes.rb
Update outpost, add secretary workaround