Deleting line that would otherwise cause initial build to fail
Merge branch 'master' of github.com:mjsteger/dreamacs
Removing smart-parens, which blows up in larger files