Merge branch 'master' of https://github.com/joan2937/pigpio

# Conflicts:
#	pigpio.c

diff --cc pigpio.3
Simple merge

diff --cc pigpio.h
Simple merge

diff --cc pigpio.py
Simple merge