Removed traces of borrowed Makefile :P

- Hope Chris Morgan doesn't mind me 'borrowing' it.
Modified files to work with new Makefile