Convert to yamljs for yaml parsing
Fix conflicts with RC branch
Merge pull request #16 from Livefyre/yamljs

Yamljs