Updated testing.
Update PYTHONPATH for testing.
Merge branch 'master' of github.com:timster/gallery