Added/Modified some netbeans settings
Added some common backgrounds I use
Merge branch 'master' of https://github.com/mattsoftware/config_matt
Fixed up a few files
Merge remote-tracking branch 'blueweb/master'