Cleaning up depedencies.
Remove extraneous files.
Removed oldstyle setup files.
Fix #242 by redoing pull request from zaldabus.