removing old code, fixing packaging conflicts
removing old code
Merge pull request #24 from zinic/master

 	removing old code, fixing packaging conflicts