Gemfile cleanup
Add .jrubyrc file
Added rack gem.

environments weren't set for whiskey or vodka
Moving the rake gem inclusion to only this branch for now.
Updating Gemfile.lock
Updates to use trinidad instead of padrino
fix bug #1088
Revert "fix bug #1088"

This reverts commit c53ea1052357bfb0b77bfa116ec16b1dc23d9c22.
Merge branch 'development', remote-tracking branch 'origin' into 001_vodka
Merge pull request #7 from 6fusion/001_vodka

001 vodka