merge from kngenie:

cleanup setup.py indent for ease of add/remove things. also use find_package().