diff --git a/.gitignore b/.gitignore
index ac0f761a00..abf43bc60b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,151 +1,168 @@
 # Common
 \#*
 .\#*
 GPATH
 GRTAGS
 GTAGS
 TAGS
 Makefile
 Makefile.in
 .deps
 .libs
 *.pc
 *.pyc
 *.bz2
 *.rpm
 *.la
 *.lo
 *.o
 *~
 *.gcda
 *.gcno
 
 
 # Autobuild
 aclocal.m4
 autoconf
 autoheader
 autom4te.cache/
 automake
 build.counter
 compile
 config.guess
 config.log
 config.status
 config.sub
 configure
 depcomp
 install-sh
 include/stamp-*
 libltdl.tar
 libtool
 libtool.m4
 ltdl.m4
 ltmain.sh
 missing
 py-compile
 m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+test-driver
+ylwrap
 
 # Configure targets
+Doxyfile
+coverage.sh
 cts/CTSvars.py
 cts/LSBDummy
 cts/benchmark/clubench
+cts/lxc_autogen.sh
+extra/logrotate/pacemaker
 include/config.h
 include/config.h.in
 include/crm_config.h
+lrmd/pacemaker_remote
+lrmd/pacemaker_remote.service
 mcp/pacemaker
+mcp/pacemaker.combined.upstart
 mcp/pacemaker.service
+mcp/pacemaker.upstart
 pengine/regression.core.sh
 publican.cfg
 shell/modules/help.py
 shell/modules/ra.py
 shell/modules/ui.py
 shell/modules/vars.py
+tools/cibsecret
 tools/coverage.sh
+tools/crm_mon.upstart
 tools/crm_report
+tools/report.common
 lrmd/regression.py
 fencing/regression.py
 
 # Build targets
 *.7
 *.7.xml
 *.7.html
 *.8
 *.8.xml
 *.8.html
 doc/*/en-US/images/*.png
 doc/*/tmp/**
 doc/*/publish
 cib/cib
 cib/cibmon
 cib/cibpipe
 crmd/atest
 crmd/crmd
 doc/Clusters_from_Scratch.txt
 doc/Pacemaker_Explained.txt
 doc/acls.html
 doc/crm_fencing.html
 fencing/stonith-test
 fencing/stonith_admin
 fencing/stonithd
 fencing/stonithd.xml
 lrmd/lrmd
 lrmd/lrmd_test
 mcp/pacemakerd
 pengine/pengine
 pengine/pengine.xml
 pengine/ptest
 shell/regression/testcases/confbasic-xml.filter
 scratch
 tools/attrd
 tools/attrd_updater
 tools/cibadmin
 tools/crm_attribute
 tools/crm_diff
 tools/crm_mon
 tools/crm_node
 tools/crm_resource
 tools/crm_shadow
 tools/crm_simulate
 tools/crm_uuid
 tools/crm_verify
 tools/crmadmin
 tools/iso8601
 tools/crm_ticket
 tools/report.collector.1
 xml/crm.dtd
 xml/pacemaker.rng
 extra/rgmanager/ccs2cib
 extra/rgmanager/ccs_flatten
 extra/rgmanager/disable_rgmanager
+doc/Clusters_from_Scratch.build
 doc/Clusters_from_Scratch/en-US/Ap-*.xml
 doc/Clusters_from_Scratch/en-US/Ch-*.xml
+doc/Pacemaker_Explained.build
 doc/Pacemaker_Explained/en-US/Ch-*.xml
 doc/Pacemaker_Explained/en-US/Ap-*.xml
+doc/Pacemaker_Remote.build
+doc/Pacemaker_Remote/en-US/Ch-*.xml
 lib/gnu/libgnu.a
 lib/gnu/stdalign.h
 *.coverity
 
 #Other 
 mock
 HTML
 pacemaker.spec
 pengine/.regression.failed.diff
 ClusterLabs-pacemaker-*.tar.gz
 coverity-*
 
 compat_reports
 .ABI-build
 abi_dumps
 logs
 
 *.patch
 *.diff
 *.sed
 *.orig
 *.rej
 *.swp
 pengine/test10/shadow.*
diff --git a/README.markdown b/README.markdown
index 0d4ed738c7..8d57f0f842 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,91 +1,92 @@
 # Pacemaker
 
 ## What is Pacemaker?
 Pacemaker is an advanced, scalable High-Availability cluster resource
 manager for Linux-HA (Heartbeat) and/or Corosync.
 
 It supports "n-node" clusters with significant capabilities for
 managing resources and dependencies.
 
 It will run scripts at initialization, when machines go up or down,
 when related resources fail and can be configured to periodically check
 resource health.
 
 ## For more information look at:
 * [Website](http://www.clusterlabs.org)
 * [Issues/Bugs](http://bugs.clusterlabs.org)
 * [Mailing list](http://oss.clusterlabs.org/mailman/listinfo/pacemaker).
 * [Documentation](http://www.clusterlabs.org/doc)
 
 ## User interfaces / shells
 
 There are multiple user interfaces for Pacemaker, both command line
 tools, graphical user interfaces and web frontends. The _crm shell_
 used to be included in the Pacemaker source tree, but is now
 maintained as a separate project.
 
 This is not meant to be an exhaustive list:
 
 * _crmsh_: https://crmsh.github.io/
 * _pcs_: https://github.com/feist/pcs/
 * _LCMC_: http://lcmc.sourceforge.net/
 * _hawk_: https://github.com/ClusterLabs/hawk
 
 ## Build Dependencies
 * automake
 * autoconf
 * libtool-ltdl-devel
+* libuuid-devel
 * pkgconfig
 * python
 * glib2-devel
 * libxml2-devel
 * libxslt-devel 
 * python-devel
 * gcc-c++
 * bzip2-devel
 * gnutls-devel
 * pam-devel
 * libqb-devel
 
 ## Cluster Stack Dependencies (Pick at least one)
 * clusterlib-devel (CMAN)
 * corosynclib-devel (Corosync)
 * heartbeat-devel (Heartbeat)
 
 ## Optional Build Dependencies
 * ncurses-devel
 * openssl-devel
 * libselinux-devel
 * cluster-glue-libs-devel (LHA style fencing agents)
 * libesmtp-devel (Email alerts)
 * lm_sensors-devel (SNMP alerts)
 * net-snmp-devel (SNMP alerts)
 * asciidoc (documentation)
 * help2man (documentation)
 * publican (documentation)
 * inkscape (documentation)
 * docbook-style-xsl (documentation)
 
 ## Source Control (GIT)
 
     git clone git://github.com/ClusterLabs/pacemaker.git
 
 [See Github](https://github.com/ClusterLabs/pacemaker)
 
 ## Installing from source
 
     $ ./autogen.sh
     $ ./configure
     $ make
     $ sudo make install
 
 ## How you can help
 If you find this project useful, you may want to consider supporting its future development.
 There are a number of ways to support the project.
 
 * Test and report issues.
 * Tick something off our [todo list](https://github.com/ClusterLabs/pacemaker/blob/master/TODO.markdown)
 * Help others on the [mailing list](http://oss.clusterlabs.org/mailman/listinfo/pacemaker).
 * Contribute documentation, examples and test cases.
 * Contribute patches.
 * Spread the word.