Merge branch 'development' of github.com:skunath/ROQTI

Conflicts:
	lib/ROQTI.rb
Merge branch 'development' of github.com:skunath/ROQTI
Merge branch 'development' of github.com:skunath/ROQTI

Conflicts:
	lib/ROQTI.rb
Merge pull request #36 from astine/master

Cleaned out some typos that were preventing rspec from running