settings.py modified for test server
Merge branch 'testserver'
remove pyc files