Merge pull request #375 from iameric1986/master

Code clean up
cleaning up and java docing
added javadocs and cleaned up code not needed
Merge pull request #376 from rjynn/master

created javadocs and cleaned up code not needed
added some javadocs
Merge remote-tracking branch 'upstream/master'
Merge pull request #377 from rjynn/master

added javadocs
FUCK YOUR MERGE CONFLICTS RUBY
FUCK YOUR MERGE CONFLICTS RUBY