- added optional port for DataStore
- added intellij idea sbt plugin
fix .gitignore and remove obsolete .idea_modules dir
Merge branch 'master' of github.com:fkoehler/pillar into fkoehler-master

Conflicts:
	.gitignore
	project/plugins.sbt
Merge branch 'fkoehler-master'