Merge pull request #67 from unwin/develop

Develop
Refectored classes to match
Merge pull request #71 from andylyall/develop

Refectored classes to match
Fix merge 2014.05
Finish fixing merge conflict
Merge pull request #72 from andylyall/develop

Develop
Fixed a last second bug I introduced last PR