Trying to conform to PSR-2 coding standards
https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
make make_csv prettier
Merge branch 'next'
Merge branch 'master' into next