Merge remote-tracking branch 'origin/master'
Reorganized pom so deps are grouped
Assigned default dep scope to a variable
Changed default dep scope to compile