remove config.json
Merge branch 'master' into private
update OAuth naming
move .gitignore up one level
add twitter trends
merging from private