Merge conflict resolution due to moving svn -> github, externalizing scripts, removed geoext