local include
Merge branch 'origin/master'

Conflicts:
	src/aubio_priv.h
Merge branch 'refs/heads/develop'