merge from pyproj svn
update pyproj
Merge pull request #112 from jswhit/master

update pyproj from pyproj svn