minor changes
Merge branch 'master' of https://github.com/colinbdclark/flocking-papers
adding references
citations updated
Merge remote-tracking branch 'drart/master'

* drart/master:
  adding references
  minor changes

Conflicts:
	icmc-2014/flockingicmc2014.tex