Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Do not set machine as probed when associating a key because it breaks when
machines get created too quickly
Merge pull request #147 from mistio/create_machine_fix

Do not set machine as probed when associating a key
Automated build of mist.js & mist.css
Merge remote-tracking branch 'origin/staging'
Properly disable collectd on the server
Merge pull request #148 from mistio/collectd_script

Collectd script
Merge branch 'staging' into docker