Bunch of Fixes

Other than the regexes, this shouldn't change any functionality... it just has a TON of formatting changes and `;`'s added.

...Speaking of `;`'s (and how annoying they are), would you be interested in switching this project to [CoffeeScript](http://coffeescript.org). IMO, this would improve the code quality a lot.