Merge pull request #1 from mastercoin-MSC/master

get up to date
Merge pull request #2 from mastercoin-MSC/master

catchup
Merge pull request #3 from mastercoin-MSC/master

catchup
Update syntax/language for tooltip
Merge pull request #429 from achamely/master

Update syntax/language for tooltip