removed v2 from master branch

v2 is still accessible through v2 branch
update license name to satisfy PGBuild

license stays the same, it's just named differently so that PGBuild will recognize it
Merge pull request #83 from bwin/master

preparing for PGBuild