Merge pull request #1 from andypiper/master

merge latest
Merge pull request #2 from andypiper/master

favicon gone got broke
Merge pull request #3 from andypiper/master

incorporate suggestions from Monica
Merge pull request #4 from andypiper/master

added info on follower limits for clarity
Merge pull request #2 from cloudfoundry-samples/master

Updated for current CF