update from zen to emmet, added tern for vim, add drush and bash aliases
merge bundles