Merge branch 'fix' into 1.7.x
Merge branch 'issue805' into 1.7.x
Upgraded JRuby to 1.7.6
Partially fix an error with the bourbon/sass unit tests.

The scss file were being identified as having content type JS
to the sass css processor.  On some platforms this caused an error.

The main test in TestBourbonCssProcess is still Ignored however because
of issues around the working dir.
merge pull request
remove unnecessary repository in root pom.xml
fix merge conflicts