Merge hexojs to billryan

Merge hexojs to billryan