Syncing repos
Started doing a little styling, and fixing up some of the code.
I really need to document the licensing differences.