fixed shipmate and other left overs
removed backup directory
powerline
changes
Merge