Misc changes
Merge branch 'dev' of http://github.com/MetaLang/RubyQuest into dev