Tidied makefile
Fixed RAM/ROM usage statements

Conflicts:

	Makefile
Merge branch 'master' into LPC1102