Fixed conflicts, getting to work on giving arbitrary doubles meaning
 Please enter the commit message for your changes. Lines starting
Merge branch 'master' of github.com:wmarshall/autowub