Merge remote-tracking branch 'origin/imac'
refactoring jquery plugins
continued UI refinement
content creation
Merge pull request #1 from californiavol/dell

Dell
Merge pull request #2 from californiavol/master

merge master into imac