Remove hard-coded Geshi support
More geshi removal
Fix a few typos
Add in hardcoded second alias similar to puush