Teach indent about buffer_t and re-indent
Merge branch 'master' into gozer