Make install

Add 'make install'. Also refactor the makefile to be a little cleaner