moved location choices to separate method
only send edit notification the first time the listing is edited
Merge branch 'master' of git://github.com/CCETC/DirectoryBundle