Quantal -> Trusty
Merge branch 'stable' of github.com:stevage/saltymill into stable