updating init.pp to remove dependencies added elsewhere
Kept drush from being re-installed every time puppet is run
updating drush location
Upgrading to drush 7.5
Merge remote-tracking branch 'acouch/master'

Conflicts:
	Modulefile
	manifests/init.pp
Add gitignore - ignore residual merge files