code cleanup and added settlement in units
fixed conflicts
added simple unit test
Merge pull request #2 from haikezegwaard/master

removed unused code, cleaned up some files