removed dependancy on config.h
Merge remote-tracking branch 'refs/remotes/origin/master'
added config.h
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'refs/remotes/github.com/master' into master-2
Merge branch 'origin/master'

Conflicts:
	src/aubio_priv.h