Add unite shortcuts and replace bundle with neobundle