Updating links for Oracle Linux 5.9 and 6.4, adding Oracle Linux 6.5 boxes
Fixing conflicts
Merge branch 'stoilis-master'