Merge of rsearls and OndraZizka workspace

Here are the merged changes.  Unfortunately this also has my Intellij .idea directory.  I will investigate moving it so it does not get added to future commits.