Big refactor
Minor improvements
Neobundle update
Remove submodules
Delete .submodules file
Revert last change