Fix border rendering bug
Update readme
add grunt watch