Push travis (yet again)

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Yapsy has a sane versioning scheme now!

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
missing some whitespace.  (and vim tricked me into thinking I had it)

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
clarify a bit

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
fix version in sphinx

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
fix set_version.py script to include sphinx config

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
remove things that don’t work with our docs anyways

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Add EXTRA_PLUGINS_DIRS config variable

This can be used to point to any directory containing Nikola plugins.
This is more convenient than installing plugins in the site, for each
Nikola site that I maintain/use.
Merge pull request #953 from getnikola/extra-plugins-dir

Add EXTRA_PLUGINS_DIR config variable
more documentation for #953

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Changelog for #953

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGES.txt
url fixes

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
add a warning

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
flake8

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
push travis

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
remove a debug print statement

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge remote-tracking branch 'upstream/master'