Merge PoolBoy 1.3#5

Open

JeetKunDoug wants to merge 2 commits intodevelopfrom

Commits on Oct 17, 2014

Merge upstream/1.3
Doug Rohrer
committed

Commits on Oct 20, 2014

Re-added PULSE code so we can run pulse test.
Doug Rohrer
committed