Better defaults
Merge branch 'feature/improve_makefiles' of github.com:bastih/hyrise into feature/improve_makefiles