I have fixed every thing!

should work now
Merge pull request #24 from jdmielke/master

I have fixed every thing!
Committing changes for merging with Jon's pull request
Minor additions to UI across the board
Merge pull request #25 from Hartman2/master

Week of October 27th merge
resolving merge conflicts and pulling upstream