minor changes
Merge branch 'master' of https://github.com/cyrus-/grants

Conflicts:
	2013-NSF-ABI/ProjectDescription.tex