More cleanup and stuff, including changing from elifs to Java 7 switch with strings statements
Merge pull request #6 from Nathan2055/develop

More cleanup and stuff, including changing from elifs to Java 7 switch w...