Merge pull request #8 from williecheong/staging

Staging
Merge pull request #10 from williecheong/staging

Staging
Merge branch 'staging'
Merge pull request #13 from williecheong/staging

Staging
Merge branch 'staging'
Merge branch 'staging'
Base site url for production
Merge branch 'master' into staging