Added .idea/ to gitignore
Fixed Package[libcurl4-openssl-dev] duplicated definition in squeeze
Merge remote-tracking branch 'origin/master' into example42-puppet-mysql