Merge pull request #81 from Jedwondle/master

Committing the changes to the data. We're still working on getting it fully integrated.
Merge pull request #82 from Jedwondle/master

Fixed some small bugs that were effecting the content. Also adjusted css and loader positioning.
Merge pull request #83 from Jedwondle/master

Did some work on the filters to make them more readable, also fixed a bug with navigation.
Merge pull request #84 from Jedwondle/master

Small adjustments to get watches working.