Cleaned up code, moved changelog and todo out
Merge pull request #26 from chuckleb/cleancode

Cleaned up code, moved changelog and todo out