added wave breaking and local-vs-global methods
Merge branch 'master' of https://github.com/reedessick/nmodelte

apparently i added something and now need to merge