Merge branch 'master' of github.com:beanumber/nyc311

# Conflicts:
#	DESCRIPTION