Location import safety

primarily fixes p1 commtrack bug: http://manage.dimagi.com/default.asp?112938

and some minor cleanup and ux i found along the way.

can review commit by commit or all at once. is pretty easy.