Move files around for uploading to pypi

Includes some fixes to the setup.py which include files during
packages. Had to move the vlfeat source submodule in to the package
so that I can upload it properly.