Monday late afternoon

Closer
Merge branch 'master' of https://github.com/nonproliferation/proposals

Conflicts:
	20140714 netsci draft evening.tex