Added more error checking around dictionary and some refactoring
Refactoring
Merge branch 'master' of github.com:DSaunders/AtomicCMS