fixed build error when make run with -jN option

Race can occur when gitversion file isn't fully generated before
it is used.
Merge remote-tracking branch 'pasis/gitversion'
Merge remote-tracking branch 'origin/master' into plugins

Conflicts:
	.gitignore
	.travis.yml
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
Merge branch 'plugins' of github.com:boothj5/profanity into plugins

Conflicts:
	.travis.yml
	Makefile.am