Bug/fix init install

@micah, do you think this will solve our problem in a cleaner way?
If so, let's merge both commits into debian, and I can merge the setup.py commit into develop.