Merge pull request #217 from Jedwondle/master

Added the API stuff to the main branch.
Merge pull request #218 from Jedwondle/master

Fixed a bower.json issue.