initial merge of locations code
remove redundent Address and Point types
Merge pull request #1 from dkackman/master

initial merge of locations code