Fix build scripts

Makefile

@@ -7,7 +7,7 @@ PYTHON_PATH := $(shell which python)
 PLATFORM := $(shell uname -s | awk '{print tolower($$0)}')
 DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 PYTHON_VERSION := $(shell python3 -c "import sys; print('py%s%s' % sys.version_info[0:2] + ('-conda' if 'conda' in sys.version or 'Continuum' in sys.version else ''))")
-PREFIX=""
+PREFIX=
 ifndef GIT_BRANCH
 GIT_BRANCH=$(shell git branch | sed -n '/\* /s///p')
 endif
@@ -97,10 +97,12 @@ upload:
 ifeq ($(GIT_BRANCH),develop)
 	@echo "INFO:	Upload package to testpypi.python.org"
 	$(PREFIX)python setup.py check --restructuredtext --strict
-	$(PREFIX)python setup.py sdist bdist_wheel upload -r https://testpypi.python.org/pypi
+	$(PREFIX)python setup.py sdist bdist_wheel
+	$(PREFIX)twine upload dist/*
 endif
 ifeq ($(GIT_BRANCH),master)
 	@echo "INFO:	Upload package to pypi.python.org"
 	$(PREFIX)python setup.py check --restructuredtext --strict
-	$(PREFIX)python setup.py sdist bdist_wheel upload
+	$(PREFIX)python setup.py sdist bdist_wheel
+	$(PREFIX)twine upload dist/*
 endif

README.rst

@@ -58,7 +58,7 @@ Feeling impatient? I like your style.
 
 
 Installation
-~~~~~~~~~~~~
+------------
 
 Download and install using ``pip install jira`` or ``easy_install jira``
 
@@ -74,15 +74,15 @@ installation using ``pip install jira[opt,cli,testing]``
 
 
 Usage
-~~~~~
+-----
 
 See the documentation_ for full details.
 
 .. _documentation: http://jira.readthedocs.org/en/latest/
 
 
 Development
-~~~~~~~~~~~
+-----------
 
 Development takes place on GitHub_, where the git-flow_ branch structure is used: