Squashed commit of the following:

commit 8f0bca4a9dc18efeb73ded6e17ebc6108564289a
Author: Luke Campagnola <luke.campagnola@gmail.com>
Date:   Mon Jan 13 11:41:56 2014 -0500

    Backward compatibility for generator pulse train 'interpulse_length' parameter