add sideways
ctrlp moved
Add dash
add cjsx support
Merge remote-tracking branch 'upstream/master'