added remote and non remote chef server build fucntionality
fixed merge conflicts