check if filezilla is already installed
Merge pull request #49 from wimvds/missing-apps

check if filezilla is already installed
Fix foodcritic errors
Fix if ruby statements
Merge pull request #50 from stephaneb/fix/java_jdk

changed java from 7 to 6
added virtualbox guest additions install
added nfs-kernel-server
moved nfs-kernel-server to vagrant recipe
Merge pull request #52 from stephaneb/fix/vagrant

added nfs-kernel-server to install
Merge pull request #51 from stephaneb/fix/virtualbox

added virtualbox guest additions install
drush (cli shell for Drupal)
Update drush.rb
Merge pull request #53 from wimvds/missing-apps

drush (cli shell for Drupal)
added php5-sqlite to install pacakges
removed a2enmod fastcgi
Merge pull request #57 from stephaneb/fix/a2enmod_fastcgi

removed a2enmod fastcgi
Merge pull request #56 from stephaneb/fix/php5_sqlite

added php5-sqlite to install pacakges
Merge branch 'master' into fix/vagrant

* master:
  removed a2enmod fastcgi
  added php5-sqlite to install pacakges
  Update drush.rb
  drush (cli shell for Drupal)
  moved nfs-kernel-server to vagrant recipe
  added nfs-kernel-server
  added virtualbox guest additions install
  Fix if ruby statements
  Fix foodcritic errors
  check if filezilla is already installed

Conflicts:
	recipes/virtualbox.rb