Update version in IntelliJ name
Use node['current_user'] instead of WS_USER
Merge branch 'upstream' into feature/flowdock
Parameterize Flowdock
Merge branch 'feature/flowdock'

Conflicts:
	sprout-osx-apps/recipes/flowdock.rb
Merge branch 'upstream' into feature/intellij-update
Parameterize Intellij, remove WS_USER
Merge branch 'feature/intellij-update'

Conflicts:
	sprout-osx-apps/recipes/intellij_ultimate_edition.rb