Merge pull request #49 from gantry/staging

Merging staging into master for the live website
Merge pull request #53 from gantry/staging

Various fixes
Merge pull request #56 from gantry/staging

Deprecated Edit
Merge pull request #68 from gantry/staging

Merging from Staging
Merge pull request #69 from gantry/master

Merging from Staging