Oil update
Merge branch 'working'

Conflicts:
	oil/kleo.html