fixed merge errors
removed psake files, using fake