Fixed upstream conflict - removed the variables and modules
#1213 - Added hte local makefile
Added makefile for local profile