* Added bits to give more options in how extra_path is specified. Also moving locations, so committing so I can grab updates.