georef fixes
added more metadata and a few pep8 edits
merged conflict in rectify
Merge branches 'new_branch_name' and 'master'