Minor fixes.
Merge branch 'univpolyproj' of github.com:mattam82/coq into univpolyproj

Conflicts:
	tactics/tactics.ml