Remove melpa package from list of default packages
Minor cleanup
Merge remote-tracking branch 'origin/master' into dev