Fixed Makefile.
Merge pull request #36 from joelixny/master

Fixed various issues with Makefile for single user install.