merge changes from my fork 

added co-sleep, datejs, etc ..