added .vagrant to gitignore
move stuff around
fix merge conflict
add wpms-git puppet module

This isn't finished yet, it shouldn't run on vagrant (it does)
just commiting to make sure I don't lose it
Merge branch 'master' of github.com:KarelOK/wp-multisite-stack

Conflicts:
	classes/mysql.pp
	install.sh
	puppet/classes/apache.pp
	puppet/classes/extra.pp
	puppet/classes/install-wp-mysql.pp
	puppet/classes/install-wp.pp
	puppet/classes/mysql.pp
	puppet/classes/notify.pp
	puppet/classes/vars.pp
	puppet/site.pp
	setup/puppet/modules/mysql/manifests/init.pp
fix for disable run wpms-git in virtualbox
Merge branch 'master' of github.com:Link7/wpms-stack
added credits for the git workflow
Merge branch 'master' of github.com:Link7/wpms-stack
added wpms-stack-helper plugin

this plugin will add a section to the WP dashboard
where the user can manage some parts of his wpms-stack
move special puppet modules into wpms_stack module
added cron for autocommit
fix previous commit git autocommit
clarify git autocommit in wp plugin
dont run autocommit during puppet apply
fix autcommit cron
remove git notify debug message
clarification wp git autocommit script doesn't use puppet
fix for #35

found this on http://stackoverflow.com/questions/16843382/colored-shell-
script-output-library
merge fix