Merge remote-tracking branch 'tbrs/master' into heroku

Grab the configuration struct changes. It was expeditious to un-do
some of my by-hand line-wrapping that avoids 80 character limit,
though.

Conflicts:
	config.c
	config.h
	repmgr.c
	repmgr.h
	repmgrd.c

repmgr.h

@@ -26,12 +26,14 @@
 #include "libpq-fe.h"
 
 #include "dbutils.h"
-#include "config.h"
 
 
 #define PRIMARY_MODE		0
 #define STANDBY_MODE		1
 
 #define CONFIG_FILE			"repmgr.conf"
+#define QUERY_STR_LEN		8192
+
+#include "config.h"
 
 #endif