Merge pull request #16 from jhoblitt/test_fixes

Test fixes
Merge pull request #18 from jhoblitt/fix_erb_warnings

fix erb instance variable warnings
Merge pull request #19 from jhoblitt/revert_pr14

Revert "Update init.pp"
Merge branch 'init_timeout' of https://github.com/jhoblitt/puppet-jboss into jhoblitt-init_timeout
rename .gemfile to Gemfile
change jboss 4 and 5 download URLs to work with puppi::netinstall

Fix per discussion in #15
Merge branch 'gemfile_rename' into devel