Merged in and tweated master/setup scripts