Added support for YAML serialization/de-serialization of Spira::Base instances using Psych.
Add back VERSION and use for version.rb.
Merge remote-tracking branch 'gkellogg/psych' into gkellogg-master
Yard updates.
Use fully-qualified RDF::XSD instead of XSD (fixes conflict with ruby 1.8 'xsd/charset')
Merge pull request #1 from dwbutler/master

Use RDF::XSD instead of XSD. Thanks, this matches how I use RDF::XSD in most of the other RDF gems.

What did you have in mind for Travis?
Rename spec files from .spec to _spec.rb.
Change it_should_behave_like to include for new rspec.
Update gem dependencies.
Version 0.3.0
Yard documentation updates.
Fix spec/serialization_spec by defining a default repository

Signed-off-by: Aymeric Brisse <aymeric.brisse@perfect-memory.com>
Allow the redefinition of properties on subclasses

Signed-off-by: Aymeric Brisse <aymeric.brisse@perfect-memory.com>
Merge branch 'activemodelish', remote-tracking branch 'ruby-rdf/master' into activemodelish

Conflicts:
	Gemfile
	Gemfile.lock
	README.md
	lib/spira/errors.rb
	lib/spira/resource/class_methods.rb
	lib/spira/resource/dsl.rb
	lib/spira/resource/instance_methods.rb
	lib/spira/type.rb
	lib/spira/version.rb
	spec/base_uri_spec.rb
	spec/basic_spec.rb
	spec/dirty_spec.rb
	spec/enumerable_spec.rb
	spec/has_many_spec.rb
	spec/hooks_spec.rb
	spec/inheritance_spec.rb
	spec/instantiation_spec.rb
	spec/nodes_spec.rb
	spec/non_model_data_spec.rb
	spec/property_types_spec.rb
	spec/querying_spec.rb
	spec/rdf_types_spec.rb
	spec/relations_spec.rb
	spec/repository_spec.rb
	spec/spec_helper.rb
	spec/type_classes_spec.rb
	spec/update_spec.rb
	spec/validations_spec.rb
	spec/vocabulary_spec.rb
	spira.gemspec
fixed enumerable_spec.rb (using updated rdf/spec syntax)
updated gem dependencies
Merge pull request #13 from PerfectMemory/fix-spec

Fix spec/serialization_spec by defining a default repository
Merge branch 'activemodelish' of github.com:cordawyn/spira into activemodelish
added Aymeric Brisse as a contributor, changed e-mails to github entries
Merge pull request #14 from PerfectMemory/inheritance-redefine

Allow the redefinition of properties on subclasses