some minor nag fixes
Merge branch 'master' of github.com:NPTricky/sdir-r2d2-ws14

Conflicts:
	milestone/2/handout/main.tex