Merge branch 'development' of github.com:mbj/ashikawa-core into devtools

Conflicts:
	Rakefile
	ashikawa-core.gemspec
	lib/ashikawa-core/collection.rb
	spec/unit/collection_spec.rb