Fix up merge problems
Merge pull request #147 from chrispbradley/master

Fix up merge problems
Bug fix for addition boundary condition parameter.
Merge pull request #148 from chrispbradley/master

Bug fix for addition boundary condition parameter.
More merging
Finished merging