Merge pull request #64 from californiavol/master

merge from master
Merge pull request #69 from californiavol/master

merge from master
Merge pull request #71 from californiavol/imac-work

Merge pull request #70 from californiavol/master
Merge pull request #72 from californiavol/macbook-branch

Merge pull request #69 from californiavol/master
Merge pull request #73 from californiavol/webs-web1dev

Merge pull request #64 from californiavol/master
Merge pull request #74 from californiavol/master

merge from master