Merge branch 'master' into dev
making this project work nicely with eclipse
Merge pull request #2 from ShadowSam/master

Small update to readme and test push from Sam's fork.
Adding bootstrap.css
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev
Adding bootstrap to website
Adding in bootstrap-tab.js and adding the tabs for the dashboard feeds.
Getting rid of this default test until it's actually needed
Caching things
I don't like view tests.  Also, these default tests need to not be running.
Added angular.js to app and tested it out.
Delete .classpath
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev
Adding more to dashboard
Formated HTML and added another thumbnail
Updated for mongo plugins
Removed target directory and killed the main.css stylesheet
Worked on master page.  Put a default, cruddy sidebar up for Sam to tweak into niceness
Delete .project

Needs to go for valid pulls
Sidebar is a bit better, needs some reworking though