durack1 bringing eguil up-to-date with durack1/master

@eguil here's an attempt at merging.. But I have a feeling it's going to require some intervention to allow the merge