McAdoo 20140804
Merge pull request #128 from mattjbarlow/mcadoo_dev

Mcadoo dev
Merge pull request #129 from mattjbarlow/staging

Staging