Merge pull request #75 from jhmatthews/dev

More robust errors and checking of populations in macro_pops