remove iloc goop
Merge branch 'master' of vcr:cody/elect

Conflicts:
	Makefile