Simplify custom package, it isnt tested yet. Added openjava 1.7 for solr. Removed the riak.conf template. Added the packagecloud repo here instead of common. Removed dependency of riak-common. Deleted ubuntu vars, hope that doesnt break anything. Need to test on debian and ubuntu.