Some clean up.
Merge branch 'master' into twitter