Merge branch 'dev' into ConfigIndependent
removes config file for tests, only twitter's OAuth info remains
Merge branch 'ConfigIndependent' into dev