Merge pull request #70 from rmsint/settings

Add block settings
Add block bundle configuration