laptop update
Merge branch 'master' of github.com:Michieljoris/dbeditor
syncing to linode now