Merge pull request #5 from mulander/master

Remove the duplicated makefile
Fixed formatting for GPR so it looks decent in GPS.