Master 2014 01 21 snapshot

Merging major improvements and new functionality back into Master branch.

Pending any final checks