Updated setup to remove install problems
Updated install instructions to include install from PyPi