little bit of style for tweet feed
using ptwitter instead of twitter for proxy conf
Keeping 6 tweets from stream instead of 1
Fix twitter module when using proxy
Merge branch 'master' into multimodules

Conflicts:
	public/js/constants.js
trying module inheritance