Changing spaces to tabs.
Merging changes to the Makefile.
Merge branch 'feature-132' of github.com:opentechinstitute/commotion-feed into feature-132