Minor changes
Merge branch 'master' of github.com:kelwinfc/Ambush

Conflicts:
	doc/sctc2012/paper.log
	doc/sctc2012/paper.pdf