Clean up package dirs containing only ".build"

These directories are often left around when switching from another
branch; git does not delete the gitignored .build directory (but it will
show up annoyingly in 'git status').
Merge branch 'devel' into shark