Merge branch 'master' of https://github.com/zachlatta/octonore

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	octonore.gemspec
	spec/spec_helper.rb