setup.py v1.0.1: include README.rst in sdist
some notes and cleanups to README.rst
Used ``futurize`` in ``future`` module to make 2/3 compatible
Accept "granularity" argument
Merge pull request #2 from catherinedevlin/master

Allow omitted minute numbers in colon-separated clock times
Merge pull request #3 from catherinedevlin/py3

Used ``futurize`` in ``future`` module to make 2/3 compatible
Merge pull request #4 from catherinedevlin/granularity

Accept "granularity" argument
comment into README.rst
change to version 1.1.0 with changes by @catherinedevlin
mv pytimeparse/test.sh to /
setup.py: playing with move to setuptools
Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py