This is master - vcd
Preparing to check in 20140211_feature_ipaclient Merge branch 'master' of ssh://review.infochimps.com:29418/infochimps-labs/ironfan-pantry
Pulling in ipaclient files

Change-Id: I8a73b5516ccfe448e8ba498afd3b410ba0647afe