Merge branch 'master' of https://github.com/BrianOBlanton/AdcircViz

Conflicts:
	AdcircViz_Init.m
cleaning up option handling