Fixed Python build process; removed redundant headers causing problems with Travis CI