merge changes from dotme
add neobundle submodule