Whitespace and small hangouts refactor
Updating twitter and tublr to work with new API revisions
Merge branch 'master' of github.com:canonical-hackers/marvin