First draft I'm happy with -- gotta get outta here
Merge pull request #535 from bradcray/changes-sep2014

First draft I'm happy with -- gotta get outta here