(WIP) Combine boundary condition setting so that both `q` and `aux` are available to these functions

Please see issue #92 for the relevant discussion as to what this PR is supposed to solve and some of the issues with this implementation.