Fix/make format target

Add 'astyle' and 'format' targets to Makefile