Devel - 04-14-2014

Merge in Jeff's updated to devel.