Fix import errors when installed from source
Merge pull request #176 from sramana/develop

Fix import errors when installed from source