Ignore workspace.xml.

Spamming up my diffs it is.
Merge remote-tracking branch 'origin/master'