Added Twitter username aliases.
Half of issue #2 is done.
Minor php-cs modification.
Merge branch 'develop'
Issue #2
Merge branch 'master' of github.com:otar/puffer