experimenting
order of scripts in vagran_machine changed
something wrond with vim module
fix
switching branch
Merge branch 'master' into devel

Conflicts:
	vagrant_machine.sh
new implementation of installer
fixed typo
Gemfile