Added twitter and the test view
twitter now actually works and test view up
Should track more
up-to-date
Merge remote-tracking branch 'michael/master'
merge