Removes a puts in the code
Adds some basic quoting functionality along with some other fixes.
Merge branch 'quotes'