Merge branch 'upwind_2nd_order'
Merge branch 'master' of http://github.com/boutproject/BOUT-dev
boundary_standard.cxx

Use "if...else if...else..." rather than "if...return;if...return;..."