Merging latest commits for live hosting on github

@Craxic - don't forget to look after gh-pages :)