Clean up my messy workspace.
Merge branch 'development' of https://github.com/smkell/weyland into development