trim lines, get rid of new lines on windows
Merge branch 'master' of https://github.com/appcelerator/hyperloop
Merge branch 'master' of github.com:appcelerator/hyperloop into master-me