Merge pull request #141 from gnauhnoj/dev

Fix typo in gulpfile
fixing merge conflicts in app.less
Merge pull request #142 from taylorharwin/fix-merge

Fix merge
fix merge conflicts
Merge pull request #143 from taylorharwin/fix-merges

Fix merges
merge conflicts and copy edits
Merge pull request #144 from taylorharwin/fix-merges

Fix merges
Updates based on code review feedback. Add spacing to require statements, move functions out of export statements, use query string to build echonest request