Merge branch 'release/1.5.0'
update travis to build with node 0.10
Merge branch 'develop' of github.com:geowa4/pajamas into develop