Update README.md
added configuration options for JRuby
Created trinidad.rb to support deployment

Created trinidad.rb to support the deployment of JRuby projects using
The trinidad application server in conjunction with NGINX
Merge pull request #2 from battlemidget/patch-1

Update README.md
Merge pull request #1 from battlemidget/add-repo-assume-yes

lib/rockin/recipes/nginx.rb: Assume yes during add-apt-repository
added base files to support jruby deployment
polished up rockin for hosting of single webapp using trinidad
added line to do asset precompliation
made some changes to the nginx configuration for jruby
completed merge
updated trinidad configuration
Merge pull request #4 from nwwatson/master

added base files to support jruby deployment
updated trinidad configuration
Merge pull request #5 from nwwatson/master

Updated trinidad script
quick fix to jruby check
quick fix to jruby check
finalized fixes in unicorn configuration
Merge pull request #6 from nwwatson/master

updates to unicorn configuration
Added host option to connect to remote dbs
Merge github.com:entropillc/rockin

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

Conflicts:
	README.md
	lib/rockin/recipes/rbenv.rb