Updated AssetCollection to not add several time the same variable in path
Merge pull request #495 from jeremyFreeAgent/fix/1.1.x-sameVarSeveralTimeInPath

Updated AssetCollection to not add several time the same variable in path
Merge branch '1.1.x'
add register function to scssphp
rename cal => callable
Merge pull request #502 from lalop/scssphp-registerfunction

add register function to scssphp
Switched environment merge with environment set of the "NODE_PATH" env variable
Merge pull request #506 from Nek-/master

Switched environment merge with environment set of the "NODE_PATH" env variable
Add flagfile option to CompilerJarFilter
Optimize Closure jar compilation
Fixed comma typo
Removed array dereference
fixed LessUtils::filterCommentless() did not respect less-comments (closes #513)
Fix two tests that didn't pass - neither for me nor for Travis
Not so sure about this one, but looks plausible and is the current result from the filter
Merge pull request #520 from mpdude/fix-tests

Fix two tests that didn't pass - neither for me nor for Travis
Merge pull request #514 from sstok/fix-less-comment

fixed LessUtils::filterCommentless() did not respect less-comments
Merge pull request #510 from speckins/closure-optimization

Optimize Closure jar compilation
Merge pull request #509 from speckins/flagfile

Add flagfile option to CompilerJarFilter
.travis.yml - add PHP 5.5