updated prod ver
Merge pull request #127 from mattjbarlow/staging

Staging
McAdoo 20140804
Merge pull request #128 from mattjbarlow/mcadoo_dev

Mcadoo dev