Added phantom.js
Added Oracle Java 1.7
Merge branch 'master' of github.com:polopi/rails-dev-box