Twitter script update
Merge branch 'master' of github.com:joshma/astoria
Twitter stuff added
Changes to zillow.js merged