Merge pull request #12 from gentnerlab/vogel

tons of errors fixed while getting the new codebase to run on vogel
three_ac_matching
Merge branch 'vogel' into dev
Merge pull request #15 from MarvinT/dev

three_ac_matching