Merge pull request #149 from teharrison/master

stuff
Merge pull request #150 from teharrison/master

update of ipython analysis builder
Merge pull request #151 from teharrison/master

debug fix and bug fix