merged with connor
merged codebases
Merge branch 'master' of github.com:wmarshall/autowub
Merge branch 'master' of github.com:wmarshall/autowub