Removing a couple .acl2 files that are no longer necessary now that we support waterfall-parallelism with ACL2(hp) in a better way
Merge remote-tracking branch 'upstream/master'
Undoing the removal of setting waterfall
parallelism to nil in a Milawa file since I was unable to build Milawa
and confirm that the removal was an okay thing to do.

@jaredcdavis you may want to build Milawa on a recent CCL when you
  have a chance -- I was getting an error about an invalid memory
  access (like what we get when we take the car of 3)
Merge pull request #283 from ragerdl/master

Removing a couple .acl2 files that are no longer necessary now that we support waterfall-parallelism with ACL2(hp) in a better way