CLEANUP_OPTIONS: Revamp all options
Merge remote-tracking branch 'upstream/master' into work

Conflicts:
	javasources/KTool/src/org/kframework/kompile/KompileFrontEnd.java
	javasources/KTool/src/org/kframework/kompile/KompileOptionsParser.java
	javasources/KTool/src/org/kframework/krun/Main.java
CLEANUP_OPTIONS: Resolve merge conflicts
CLEANUP_OPTIONS: Revise ktest to new options
Merge remote-tracking branch 'upstream/master' into work

Conflicts:
	javasources/KTool/src/org/kframework/backend/xml/XmlBackend.java
	javasources/KTool/src/org/kframework/kompile/KompileFrontEnd.java
	javasources/KTool/src/org/kframework/ktest/KTestOptionsParser.java
	tests/config.xml
CLEANUP_OPTIONS: Resolve merge conflicts
CLEANUP_OPTIONS: Revise help messages by applying Brandon's comment
rearranging the tutorial folders
more of rearranging of tutorial files
lots of restructuring in the tutorial
changed config.xml to account for the structural changes in the tutorial
modified config.xml
Merge remote-tracking branch 'upstream/master' into options
Merge pull request #60 from daejunpark/options

Cleanup options