A bit of cleanup, made builds cleaner, and added control "ps" and control "logs" commands
Merge remote-tracking branch 'origin/DEV'