modified
Merge branch 'master' of lemmonhead.github.com:lemmonhead/shio

Conflicts:
	lib/shio.rb
Started on quotes