Merge remote-tracking branch 'origin/master'
Allow packaging to build multiple versions
Docker stuff for aptly, couchpotato, and jenkins