Added modules folder to .gitignore
Small CS fixes
vagrant as a development and functional test env
Merge pull request #36 from tPl0ch/vagrant

Vagrant as a development and functional test environment
update name of puppetlabs vagrant box
add timeout param to composer::exec

this solves #34
vagrant as a development and functional test env

Conflicts:
	.gitignore
update name of puppetlabs vagrant box
manually merging in changes from exec_timeout branch