Makefile cleanup, use variables
Do not put intellustre and magpienetworkfs config into templates
by default.  They are not part of standard Hadoop and 99% of people
won't use it.