Merge pull request #78 from cdondrup/hydro-devel

Changing twitter_bootstrap branch to master