Version to 2.3.4
Version to 2.4.0-SNAPSHOT in preparation for major API and internal changes
Fix errors in permission declaration
Simple NPE check. Fixes #315
Move packages around appropriately
Merge branch 'master' into core-rewrite