November 2014 Sprint

Merging into master commits from November 2014 Sprint. Including fixes for the following issues: #58, #72, #75, #76, #77