Fixed packaging etc... TODO: Packaging is crap, use seperate setuptools/distribute for python stuff now?