Fix more deprecation warnings

 For example:

 ```
 Warning: Variable access via 'magic' is deprecated. Use '@magic' instead. template[/var/apps/pp-puppet/vendor/modules/nginx/templates/vhost-default.conf.erb]:14
 ```
Merge pull request #19 from alphagov/fix-warnings

Fix more deprecation warnings