Merge pull request #3 from petercunning/master

updates
Merge pull request #4 from petercunning/production

Merge pull request #3 from petercunning/master
Merge pull request #5 from petercunning/master

Merge pull request #4 from petercunning/production
Merge pull request #6 from petercunning/master

updates
Merge pull request #7 from petercunning/staging

Merge pull request #6 from petercunning/master
Travis change
Merge pull request #9 from petercunning/production

Merge pull request #5 from petercunning/master
Merge pull request #8 from petercunning/staging

Travis change
Merge branch 'master' into bootstrap