new phpstorm 7 and vagrant server setup
get rid of magic quotes warning
get rid of ob_start warning
update plugin registry
remove fcgi dispatch
selenium
ignore thumbs.db
vagrant nginx config
ignore more stuff
just for testing
ignore more stuff
removed .idea directory
remove extraneous close tags
change debug to xdebug
don't ignore zend library and google api library
remove magic quotes runtime setting
reformat. fix doc blocks
Change sort order of property picklist
add textmethod=getUri to property picklist todisplay full curie instead of label
Merge branch 'master' of https://github.com/jonphipps/Metadata-Registry

* 'master' of https://github.com/jonphipps/Metadata-Registry:
  update feed url again
  update feed url
  Updated import to add generic as well as marc21
  Added EasyRDF Library

Conflicts:
	.gitignore
	plugins/jpAdminGeneratorPlugin/data/tasks/importVocabulary.php