Cleaned up extraneous stuff from Makefile.
Merge branch 'master' of github.com:harrycheung/testscroll