Merge pull request #1 from marbindrakon/develop

merge changes back
Merge pull request #2 from marbindrakon/develop

refresh own repo
adding shiny ajax stuff
fix ajax loading of settings

1. try
fixing ajax settings
removing unused stuff
adding some exception handling
Merge pull request #69 from Barbers/develop

adding ajax to settings page and some error handling